update

FFIB 2 years ago
parent
commit
1070e892c3
1 changed files with 13 additions and 8 deletions
  1. 13 8
      api/tenancy_admin_views.py

+ 13 - 8
api/tenancy_admin_views.py

@@ -323,25 +323,30 @@ def shot_request_tracking_info(request, administrator):
323 323
     tracking_info = {}
324 324
     if type_ == 'tracking':
325 325
         if req.express_com and req.tracking_number:
326
-            tracking_info = KuaiDi100().track(req.express_com, req.tracking_number)
326
+            tracking_info = get_tracking_info(req.express_com, req.tracking_number)
327 327
             req.tracking_info = tracking_info
328 328
             req.save()
329 329
     else:
330 330
         if req.back_express_com and req.back_tracking_number:
331
-            tracking_info = KuaiDi100().track(req.back_express_com, req.back_tracking_number)
331
+            tracking_info = get_tracking_info(req.back_express_com, req.back_tracking_number)
332 332
             req.back_tracking_info = tracking_info
333 333
             req.save()
334 334
 
335 335
     if tracking_info:
336
-        try:
337
-            tracking_info = json.loads(tracking_info)
338
-        except Exception:
339
-            tracking_info = {}
340
-
341
-    if tracking_info:
342 336
         tenancy_tracking_info_subscribe(req, 'tracking')
343 337
 
344 338
     return response(data={
345 339
         'type': type_,
346 340
         'tracking_info': tracking_info,
347 341
     })
342
+
343
+
344
+def get_tracking_info(express_com, tracking_number):
345
+    tracking_info = KuaiDi100().track(express_com, tracking_number)
346
+    if tracking_info:
347
+        try:
348
+            tracking_info = json.loads(tracking_info)
349
+        except Exception:
350
+            tracking_info = {}
351
+
352
+    return tracking_info